Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

followup safety checks for #23295 (backport #23321) #23340

Merged
merged 1 commit into from
Feb 25, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 25, 2022

This is an automatic backport of pull request #23321 done by Mergify.
Cherry-pick of 5e0086c has failed:

On branch mergify/bp/v1.9/pr-23321
Your branch is up to date with 'origin/v1.9'.

You are currently cherry-picking commit 5e0086c1e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   sdk/src/lib.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/builtins.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Feb 25, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 25, 2022

automerge label removed due to a CI failure

(cherry picked from commit 5e0086c)

# Conflicts:
#	runtime/src/builtins.rs
@t-nelson t-nelson force-pushed the mergify/bp/v1.9/pr-23321 branch from 44fad50 to a2acdfc Compare February 25, 2022 06:03
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Feb 25, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 25, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 25, 2022
@mergify mergify bot merged commit ef9ffff into v1.9 Feb 25, 2022
@codecov
Copy link

codecov bot commented Feb 25, 2022

Codecov Report

Merging #23340 (a2acdfc) into v1.9 (61fea1d) will decrease coverage by 0.0%.
The diff coverage is 71.4%.

@@            Coverage Diff            @@
##             v1.9   #23340     +/-   ##
=========================================
- Coverage    81.6%    81.6%   -0.1%     
=========================================
  Files         530      530             
  Lines      148072   148074      +2     
=========================================
- Hits       120952   120945      -7     
- Misses      27120    27129      +9     

@mergify mergify bot deleted the mergify/bp/v1.9/pr-23321 branch February 25, 2022 08:58
@github-actions
Copy link
Contributor

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts locked PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant